Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify tests (backport #849) #868

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Simplify tests (backport #849) #868

merged 2 commits into from
Apr 17, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 30, 2023

This is an automatic backport of pull request #849 done by Mergify.
Cherry-pick of b28a870 has failed:

On branch mergify/bp/iron/pr-849
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit b28a870.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   ur_robot_driver/test/test_common.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/test/dashboard_client.py
	both modified:   ur_robot_driver/test/robot_driver.py
	both modified:   ur_robot_driver/test/urscript_interface.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@fmauch fmauch self-requested a review April 16, 2024 18:49
@RobertWilbrandt @fmauch
Simplify tests (#849)
02b5566 
* Remove duplication of launch description in tests
* Move launch and interfacing boilerplate to common file
* Move all test logs to python logging
This makes it easier to differentiate between ROS and test framework
messages
* Move waiting for a controller to test_common
* Move robot starting to dashboard interface
* Remove unused request definition

(cherry picked from commit b28a870)
@fmauch fmauch removed the conflicts label Apr 17, 2024
fmauch
fmauch approved these changes Apr 17, 2024
View reviewed changes
Copy link
Collaborator

@fmauch fmauch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be the same as main now.

@fmauch fmauch merged commit f0c1c88 into iron Apr 17, 2024
7 checks passed
@fmauch fmauch deleted the mergify/bp/iron/pr-849 branch April 17, 2024 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmauch fmauch fmauch approved these changes

Assignees
No one assigned
Labels
iron
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fmauch @RobertWilbrandt